Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[sonic-utilities] Update submodule #5828

Closed

Conversation

madhanmellanox
Copy link
Contributor

- Why I did it
Updating submodule for sonic-utilities to get the changes to Azure master. The following were the commits that were part of this submodule.

[celestica] consutil to support customize tty device name (#1155) 3a7457c

Fix exception for ipaddress in python2 (#1164) 059cdca

[watermarkstat] Add unit tests for watermarkstat show commands (#1157) a733df5

[consutil] Fix issue where the show line command crash if no ttyUSB exists (#1173) e51d44f

[config/console] Support update console configuration related commands (#1166) c382d89

Modify fast-reboot script to use BGP service script to stop bgp service (#1177) c395e14

[consutil] Add brief option to show line command (#1176) 510d0ad

[config/show] Add CLI support for proxy arp (#1168) 59a511d

Fixes the issue with show interface counters and for pfc and queue counters. (#1180) 13bd06b

[counterpoll] Disable Counter Poll When Entering Fast Reboot (#1174) ca92e36

Remove stdeb.cfg; no longer used now that we build as wheel (#1182) 0c3a97f

fdbshow and nbrshow use SonicV2Connector with decode_responses=True, and remove all the decode() (#1187) 00a2570

[CLI][show][platform] Added ASIC count in the output. (#1185) f14bbe5

[fwutil]: Set min log priority to INFO. (#1191) e889212

Add license file, remove third-party licenses file (#1192) 63c6733

[show] remove 'device2interface_dict' in show interface neighbor expected (#1188) 1753f22

Show FG_NHG CLI Commands Added (#1056) 8af9aee

[sfputil] Display 'N/A' for non-SFP ports (#1078) ef5f212

[consutil] Store console port state in STATE_DB (#1208) e3d3d92

Add a switch to route_check to control whether write log to syslog (#1215) acfa824

[show/fgnhg.py] Fix whitespace issues (#1211) 061f428

SONiC installer - fix string formatting during image type check (#1197) 42efc03

[Mellanox] SKU creator Tool (#1163) 99de167

- How I did it
Merged sonic-utilities changes for SKU creator tool to Azure master. Now, updating the submodule changes.

- How to verify it
Use SKU creator tool to create port_config.ini file from xml file or Minigraph file which contains SKU definition.

- Which release branch to backport (provide reason below if selected)

  • 201811
  • 201911
  • 202006

- Description for the changelog

This changeset contains relevant python script files for SKU creator tool.

- A picture of a cute animal (not mandatory but encouraged)

Madhan Babu and others added 4 commits November 5, 2020 20:42
- Convert config_checker, media_checker and platform_json_checker scripts to Python 3
- Reorganize imports per PEP8 standard
- Two blank lines precede functions per PEP8 standard
…on for uniform logging (sonic-net#5790)

- Convert core_uploader.py script to Python 3
- Use logger from sonic-py-common for uniform logging
- Reorganize imports alphabetically per PEP8 standard
- Two blank lines precede functions per PEP8 standard
- Remove unnecessary global variable declarations
…onic-net#5784)

- Convert docker-wait-any script to Python 3
- Install Python 3 Docker Engine API in host OS
@jleveque jleveque mentioned this pull request Nov 5, 2020
3 tasks
@jleveque
Copy link
Contributor

jleveque commented Nov 6, 2020

Retest baseimage please

@lguohan
Copy link
Collaborator

lguohan commented Nov 6, 2020

what is the error here? @madhanmellanox , can you investigate?

@lguohan
Copy link
Collaborator

lguohan commented Nov 6, 2020

we cannot cherry-pick submodule the way as it is. please generate submodule update for 201911 branch seperately.

daall and others added 5 commits November 6, 2020 00:58
Add a switch to route_check to control whether write log to syslog (sonic-net#1215)
[consutil] Store console port state in STATE_DB (sonic-net#1208)
[sfputil] Display 'N/A' for non-SFP ports (sonic-net#1078)
Show FG_NHG CLI Commands Added (sonic-net#1056)
[show] remove 'device2interface_dict' in show interface neighbor expected (sonic-net#1188)
Add license file, remove third-party licenses file (sonic-net#1192)
[fwutil]: Set min log priority to INFO. (sonic-net#1191)
[CLI][show][platform] Added ASIC count in the output. (sonic-net#1185)
fdbshow and nbrshow use SonicV2Connector with decode_responses=True, and remove all the decode() (sonic-net#1187)
Remove stdeb.cfg; no longer used now that we build as wheel (sonic-net#1182) 
[counterpoll] Disable Counter Poll When Entering Fast Reboot (sonic-net#1174) 
Fixes the issue with show interface counters and for pfc and queue counters. (sonic-net#1180)
[config/show] Add CLI support for proxy arp (sonic-net#1168)
[consutil] Add brief option to show line command (sonic-net#1176)
Modify fast-reboot script to use BGP service script to stop bgp service (sonic-net#1177)
[config/console] Support update console configuration related commands (sonic-net#1166)
[consutil] Fix issue where the show line command crash if no ttyUSB exists (sonic-net#1173)
[watermarkstat] Add unit tests for watermarkstat show commands (sonic-net#1157)
Fix exception for ipaddress in python2 (sonic-net#1164) 
[celestica] consutil to support customize tty device name (sonic-net#1155)

Signed-off-by: Danny Allen <daall@microsoft.com>
**- Why I did it**

As part of moving all SONiC code from Python 2 (no longer supported) to Python 3

**- How I did it**

- Convert enable_counters.py script to Python 3
- Reorganize imports per PEP8 standard
- Two blank lines precede functions per PEP8 standard
@lguohan
Copy link
Collaborator

lguohan commented Nov 6, 2020

please use rebase other than merge. it is unclear what your changes are now.

@madhanmellanox
Copy link
Contributor Author

@lguohan I tried to restore back to previous working commit f506c9a in this branch, but I am getting errors while pushing the commit. I may need help.

@jleveque
Copy link
Contributor

jleveque commented Nov 8, 2020

Closing. Superseded by #5849

@jleveque jleveque closed this Nov 8, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants